Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 12 Jan 2012 21:19:39 +0000 (13:19 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 12 Jan 2012 21:19:39 +0000 (13:19 -0800)
commitc39663cd92dd139aed820b2f4b187b88c3e11f53
tree567b5aa934c7b5d7f97654bfdac49f4635c1d773
parent49753e8110baff95ef13e70ef897dc57014fa259
parent8797de74d041b4e19ba53666760e5a35c0d27dc9
Merge from trunk.